I've been poking around the OSLC APIs recently. First to build a Slack bot that can explain work items when they're mentioned in a channel and second to order open work items by the number of subscribers.
There's a bit more work to be done on the slack bot, but I feel like I can expose my script for ordering work items by subscriber count.
There are a few hardcoded values that users may want to change, but the general shape of the solution is there. Note the hard-coded project area ID around line 212 and category name on line 202. You'll probably want to change those.
The OSLC documentation on the jazz.net wiki explained how to login and perform work item queries from the REST API. A forum post on getting work item categories via the REST URIs explained how to traverse the categories for the query.
The SCM Lounge
The postings on this site are those of developers working on Rational Team Concert and don't necessarily represent IBM's positions, strategies, or opinions.
Monday, March 16, 2015
Friday, January 3, 2014
Using the SCM command-line with JazzHub
JazzHub has a great set of tools for doing web and JavaScript development directly in your web browser. Other types of development work are best done locally because the tools are there. If you happen to be using Eclipse you can find instructions from a JazzHub project page to get started. In this post I will cover how to use the command-line interface (CLI) with JazzHub. It can be a more natural fit if you aren't using the Eclipse IDE for development.
You can go back periodically to get new versions of the CLI. JazzHub is compatible with the latest release of Rational Team Concert but not the milestone releases (M1, M2, RC1, ...). If you don't want to upgrade you can generally use the CLI from previous RTC releases with JazzHub.
If you are using a 64-bit system or you would like more details check out this article.
Unzip it and add the "jazz/scmtools/eclipse" directory to your path. For example, if you are on Windows you can add to the path using the Control Panel \ System Settings \ Advanced Settings \ Environment Variables dialog by adding ";C:\path-to-unzipped-folder\jazz\scmtools\eclipse" to the end of the PATH variable.
Otherwise, you can add something like the following line to your /home/cmcgee/.bashrc file on Red Hat or SUSE:
After you change the system path you can restart your terminal or command prompt and run the "scm help" command to verify that the installation is correct. It should provide a list of the available CLI commands.
Restart your terminal and run the "scm help" command to verify that the installation is working. Java is needed for the CLI but it is an optional install on Mac OS X. If it is not installed you should be prompted to install it when running the help command.
If your project contains source code with file types that are unlikely to be known to the CLI and you are concerned about the line terminators and auto-merge behaviour then you can tell it about them using a "magic" file. First, create a file called "magic.properties" in either ".jazz-scm" in your home directory on Linux/Mac or in your user profile directory (usually something like /Users/Chris) on Windows. In that file you can create lines that look like this for each of your different file types:
Everyone on your team should add the same entries to their own magic file.
Repository URL's are long and when combined with your user ID and password make for alot of typing for each CLI command. Luckily there is a way to cache your credentials and create a nick name for the repository using the login command. This command will log in to the https://hub.jazz.net/ccm01 repository giving it a nick name of "jazzhub01":
You are prompted for your JazzHub password and all of this information is cached using the nick name "jazzhub01." When you invoke CLI commands that require a repository you can use just the nick name for the "-r" parameter and save the extra typing.
Repository workspaces hold your own changes but streams are where changes are shared with the rest of the team. To create your repository workspace run the create workspace command to create one named "myuserid-workspace1" to "flow" with your project's stream named "userid | projectname":
Each JazzHub project is given a name of the form "userid | projectname" with the userid of the initial creator. This is the name assigned to the project's stream. Also, notice the "-r" parameter with the nick name we created in the last section. Many of the CLI command use this parameter to refer to a repository URL or its nick name.
The workspace name matches the one you used to create it in the previous section. Change "folderWithCode" to the name of the folder you want to share. The last parameter should match your project name with the "Default Component" suffix. Components are a more advanced SCM topic that doesn't need to be covered for our purposes here.
At this point your source code is backed up in your repository workspace but it is not yet visible to the rest of your team. You need to flow, or deliver, the change set to the project stream so that other people can see it.
This command can take time to transfer all of the files, especially for larger projects. Notice that the repository workspace name is the one you used above to create it. The nick name makes the load command nice and terse.
The checkin command will automatically create a new change set if necessary and add the change to it. If you want to use more than one change set at a time to organize your changes (e.g. for unit tests) you can use the create changeset command.
Commands that work with change sets will show the change set ID, which is rendered as a four digit number in round brackets (e.g. "(1024)"). You use the change set ID with the checkin command to place the change into that change set.
If you forget what change sets are active in your repository workspace or you want to see what files you have changed that are not checked in you can use the "lscm show status" command. The status information will also show the change set comments and work items. These bits of contextual information can be very helpful down the road. It is good practice to assign a comment and/or associate a JazzHub work item using its number.
Other members of the team will periodically deliver their change sets to the project stream. You can keep track of these new change sets using the "lscm show status" command observing the "Incoming" section. You can flow, or accept, all of the incoming change sets into your repository workspace using the accept command.
Once the accept command is complete the changes that you have accepted will show up immediately on your hard disk.
One really useful SCM pattern is to organize your production code changes and unit test changes into separate change sets. As you are iterating on each set of changes you can temporarily suspend the production change set to validate that they fail without the production changes. When you resume them the tests should pass. You can do this with the suspend and resume commands, or "susp" and "res" if you prefer to save the extra keystrokes.
When you accept change sets from the team's stream you will occasionally run into conflicts. If files are marked as registered as text (see above section) and the content changes occur in different parts of the file the CLI will attempt to automatically resolve the conflict by applying both changes to your file. If changes cannot be automatically merged then you will need to merge in the changes yourself. Check out the show conflicts command to view the different aspects of a conflict and the resolve conflict command to resolve the conflicts in different ways (mine, proposed).
Hopefully, this post has provided some guidance on how to get started with your JazzHub project using the SCM CLI. There are a number of articles that cover how to use it in more depth. Another article was written recently about hacking JazzHub projects from the command line from a slightly different perspective.
Comments and feedback are welcome.
Downloading the CLI
The SCM CLI is available from jazz.net downloads page under the "Rational Team Concert," which is the bug tracking and source control portion of JazzHub. You use the same credentials here as you use for JazzHub. From there you can pick a release (preferably the latest) and go to the "All Downloads" section.You can go back periodically to get new versions of the CLI. JazzHub is compatible with the latest release of Rational Team Concert but not the milestone releases (M1, M2, RC1, ...). If you don't want to upgrade you can generally use the CLI from previous RTC releases with JazzHub.
Installing on Ubuntu Linux
The installation steps depend on what operating system you are using. For example, if you are using Ubuntu Linux then you can use "Ubuntu Linux package for SCM Tools" from the downloads page. Unzip it and then install using the "dpkg" tool like this:$ sudo dpkg -i scmtools_x.x.x.deb
If you are using a 64-bit system or you would like more details check out this article.
Installing on Windows / Red Hat Linux / SUSE Linux
Download the "Client for Eclipse 3.6.x IDE" for Linux from the downloads page above. The CLI is bundled with the Eclipse IDE. You don't have to use the IDE if you don't want it.Unzip it and add the "jazz/scmtools/eclipse" directory to your path. For example, if you are on Windows you can add to the path using the Control Panel \ System Settings \ Advanced Settings \ Environment Variables dialog by adding ";C:\path-to-unzipped-folder\jazz\scmtools\eclipse" to the end of the PATH variable.
Otherwise, you can add something like the following line to your /home/cmcgee/.bashrc file on Red Hat or SUSE:
export PATH=$PATH:/home/cmcgee/jazz/scmtools/eclipse
After you change the system path you can restart your terminal or command prompt and run the "scm help" command to verify that the installation is correct. It should provide a list of the available CLI commands.
Installing on Mac OS X
In the "SCM Tools" section download the Mac OS X edition. Unzip it and add an entry like the following to your /Users/Chris/.bash_profile file:export PATH=$PATH:/Users/Chris/jazz/scmtools/eclipse
Restart your terminal and run the "scm help" command to verify that the installation is working. Java is needed for the CLI but it is an optional install on Mac OS X. If it is not installed you should be prompted to install it when running the help command.
Registering file types
Although, the SCM CLI understands a number of common source code file types (e.g. C/C++, Java, Javascript, HTML, C#, Python and Go among others) it doesn't have a complete list. If it doesn't understand a particular file type it will treat it as a binary file. This may not be a problem for you. However, the CLI does not automatically convert the line terminator characters from Windows to Unix style (and vice versa) for binary files. Also, the CLI will not attempt to automatically resolve merge conflicts in the file contents when the file is binary.If your project contains source code with file types that are unlikely to be known to the CLI and you are concerned about the line terminators and auto-merge behaviour then you can tell it about them using a "magic" file. First, create a file called "magic.properties" in either ".jazz-scm" in your home directory on Linux/Mac or in your user profile directory (usually something like /Users/Chris) on Windows. In that file you can create lines that look like this for each of your different file types:
*.groovy: mime: text/plain; delim: platform
Everyone on your team should add the same entries to their own magic file.
Logging in
Now that the CLI is installed you can begin working with your JazzHub project's source code. Many of the CLI commands need to connect to a repository. Each JazzHub project is assigned to a repository with a URL (e.g. https://hub.jazz.net/ccm01). You can find your the URL in the bottom right of your JazzHub project page when you click the "here's how to get setup" link.Repository URL's are long and when combined with your user ID and password make for alot of typing for each CLI command. Luckily there is a way to cache your credentials and create a nick name for the repository using the login command. This command will log in to the https://hub.jazz.net/ccm01 repository giving it a nick name of "jazzhub01":
$ lscm login -r https://hub.jazz.net/ccm01 -u userid -c -n jazzhub01
You are prompted for your JazzHub password and all of this information is cached using the nick name "jazzhub01." When you invoke CLI commands that require a repository you can use just the nick name for the "-r" parameter and save the extra typing.
Creating your repository workspace
Unlike some other SCM systems much of your day-to-day work is normally kept in your own workspace on the server (ie. repository). Even if you are not ready to share your changes with others you are able to organize them right away into change sets. It's good to keep the changes safely stored in the repository to avoid accidental data loss due to accidental deletion or even hard drive failure.Repository workspaces hold your own changes but streams are where changes are shared with the rest of the team. To create your repository workspace run the create workspace command to create one named "myuserid-workspace1" to "flow" with your project's stream named "userid | projectname":
$ lscm create workspace -s "userid | projectname" -r jazzhub01 myuserid-workspace1
Each JazzHub project is given a name of the form "userid | projectname" with the userid of the initial creator. This is the name assigned to the project's stream. Also, notice the "-r" parameter with the nick name we created in the last section. Many of the CLI command use this parameter to refer to a repository URL or its nick name.
Sharing your code
If you are working with an established project you can skip this section. When a JazzHub project is new then your first step will be to share the source code you have on your hard disk safely into your repository workspace. Change directory (ie. cd) into the top-level folder of your source code and execute the share command:$ lscm share -r jazzhub01 myuserid-workspace1 folderWithCode "userid | projectname Default Component"
The workspace name matches the one you used to create it in the previous section. Change "folderWithCode" to the name of the folder you want to share. The last parameter should match your project name with the "Default Component" suffix. Components are a more advanced SCM topic that doesn't need to be covered for our purposes here.
At this point your source code is backed up in your repository workspace but it is not yet visible to the rest of your team. You need to flow, or deliver, the change set to the project stream so that other people can see it.
$ lscm deliver
Loading your repository workspace
If you just finished sharing your code then you can skip this section. When you want to work on an existing JazzHub project you will need to download (ie. load) the contents of your repository workspace on to your hard drive so that you can begin working with it. Create an empty folder on your hard drive, change directory (ie. cd) into it and run the load command.$ lscm load -r jazzhub01 myuserid-workspace1
This command can take time to transfer all of the files, especially for larger projects. Notice that the repository workspace name is the one you used above to create it. The nick name makes the load command nice and terse.
Working day-to-day
It's a good idea to check your changes in frequently. It can help to back up your work in case of disaster. Also, you can organize your changes right away into change sets. You can use the checkin command like this:$ lscm checkin path/to/file.txt
The checkin command will automatically create a new change set if necessary and add the change to it. If you want to use more than one change set at a time to organize your changes (e.g. for unit tests) you can use the create changeset command.
$ lscm create changeset
Commands that work with change sets will show the change set ID, which is rendered as a four digit number in round brackets (e.g. "(1024)"). You use the change set ID with the checkin command to place the change into that change set.
$ lscm checkin -c 1024 path/to/file.txt
If you forget what change sets are active in your repository workspace or you want to see what files you have changed that are not checked in you can use the "lscm show status" command. The status information will also show the change set comments and work items. These bits of contextual information can be very helpful down the road. It is good practice to assign a comment and/or associate a JazzHub work item using its number.
$ lscm set changeset --comment "Unit Tests for feature xyz" 1025 $ lscm add workitem 1025 6524Deliver all of your change sets to the stream with the deliver command. If you want to deliver specific change set(s) you can provide the change set ID's.
$ lscm deliver 1024 1025
Other members of the team will periodically deliver their change sets to the project stream. You can keep track of these new change sets using the "lscm show status" command observing the "Incoming" section. You can flow, or accept, all of the incoming change sets into your repository workspace using the accept command.
$ lscm accept
Once the accept command is complete the changes that you have accepted will show up immediately on your hard disk.
Next steps
The nick name has already saved a significant amount of typing so far. Some of the CLI commands have aliases to make them even more concise. For instance, you can replace the term "changeset" with "cs" in any of the commands shown above. Workitem can be shortened to "wi." Likewise, "checkin" is easily shortened to "ci." Command aliases can be found in the command's help (e.g. "lscm help create changeset").One really useful SCM pattern is to organize your production code changes and unit test changes into separate change sets. As you are iterating on each set of changes you can temporarily suspend the production change set to validate that they fail without the production changes. When you resume them the tests should pass. You can do this with the suspend and resume commands, or "susp" and "res" if you prefer to save the extra keystrokes.
When you accept change sets from the team's stream you will occasionally run into conflicts. If files are marked as registered as text (see above section) and the content changes occur in different parts of the file the CLI will attempt to automatically resolve the conflict by applying both changes to your file. If changes cannot be automatically merged then you will need to merge in the changes yourself. Check out the show conflicts command to view the different aspects of a conflict and the resolve conflict command to resolve the conflicts in different ways (mine, proposed).
Hopefully, this post has provided some guidance on how to get started with your JazzHub project using the SCM CLI. There are a number of articles that cover how to use it in more depth. Another article was written recently about hacking JazzHub projects from the command line from a slightly different perspective.
Comments and feedback are welcome.
Wednesday, October 16, 2013
Committing content to RTC SCM with the SDK
Now comes the fun part: committing changes to Rational Team Concert's SCM. We're going to write a program that commits new content to a file in RTC without loading it first. This isn't possible in the Eclipse, Visual Studio, or command line interfaces.
You can download a zip of the Eclipse project, or load it from JazzHub.
We're going to be committing from the client, so we need the following classes:
Note: This post uses internal API. It may change at any moment, stranding you on a specific version of RTC.
You can download a zip of the Eclipse project, or load it from JazzHub.
Relevant Architecture
As you know, RTC SCM has repository workspaces. Workspaces record the directory structure of source code in the repository. We refer to files and folders in the workspace as items. Whenever a user changes an item, a change set is created that moves the item from a before state to an after state.
If the user modifies the content of a file, the before state in the change set has the old text while the after state has the new bytes.
Internally, items have state ids that are used to uniquely identify the before and after states.
Change sets are either active or complete. An active change set can be given new after states, while a complete change set cannot have new after states associated with it.
To avoid ambiguity, an item can only appear in one active change set per workspace. In other words, if I want to commit a new change to some item that is already in an active change set, I must commit to the existing change set.
The RTC server stores objects. Every object has a unique item ID as well as a unique state ID. When one object references another, it does so with a handle. The handle consists of the item ID and, if the object cares about a specific version, the state ID. Implicitly both the object and handle have a type.
Change sets are either active or complete. An active change set can be given new after states, while a complete change set cannot have new after states associated with it.
To avoid ambiguity, an item can only appear in one active change set per workspace. In other words, if I want to commit a new change to some item that is already in an active change set, I must commit to the existing change set.
Object Model
In this example we're going to be diving deeper into the guts of the Jazz platform than usual, so you'll need to know a little about how it works. Here's a quick sketch.The RTC server stores objects. Every object has a unique item ID as well as a unique state ID. When one object references another, it does so with a handle. The handle consists of the item ID and, if the object cares about a specific version, the state ID. Implicitly both the object and handle have a type.
To minimize bandwidth consumption, the RTC server and client usually exchange handles. But eventually they need to exchange real data. When that happens, the client will fetch the full object. In our example, when the client wants to learn more about a change set, it will fetch that change set.
Fetched objects are immutable. The client cannot change them without getting a working copy first. Fields on the working copy may be set as appropriate, then the client saves it back to the RTC server. When the client modifies the object representing a file, it creates a working copy of that file.
We'll see more and more of handles, fetches, and working copies as we explore this sample.
Pseudocode
Our uploader will perform the following steps:
- Find the repository workspace and component named in the arguments.
- Find the file item in the workspace.
- Upload the file content to the repository.
- Choose a change set to record the modification.
- Tell the repository to set the after state of our change set to be the uploaded content.
You'll notice that step three is a little weird: we upload content and then create the change set, rather than doing it in one step. Welcome to the land of implementation details.
API and SDKs
This post uses internal API. It may change at any moment, meaning that any code you write will be tied to a specific version of RTC. So don't get upset if that happens. In practice, this code is pretty stable, so it probably won't happen any time soon, but...
- IWorkspaceConnection - the logical representation of a repository workspace available in the client side SDK. It provides handy caches and methods simplifying workspace access.
- IFileContentManager - provides read/write access to file content stored in the RTC SCM. (this is not supported API)
- IFileItem - a file in RTC SCM. (this is not supported API)
- IConfigurationOp - describes a change to an item in a repository workspace. The repository uses these to build change sets.
We're using a 4.0.3 version of the server and SDK. Nothing here is specific to that version, so it should work with newer and older versions. Notice I say should.
Implementation
Our example program will take a number of arguments, including:
- the workspace to commit to
- the component to commit to
- the path in the repository workspace
- the path to the new file content
I'm not going to cover resolving the workspace and component names, since we've covered that before. Instead, we'll start on line 95, where we resolve the remote path.
Resolving the Repository Path
In order to commit changes to an existing item, we need to find the item's ID. Humans, the frail beings that we are, refer to files by path. But RTC doesn't care about paths and refers to files by their item ID. So we need to find the IFileItem for the path the user gave us on the command line.
We do that in findRepositoryPath() by splitting the user's path into segments, then asking the IWorkspaceConnection for the directory structure of the component. The structure is represented by an IConfiguration, which allows us to query the item at the user's path:
private IFileItemHandle findRepositoryPath(IWorkspaceConnection wsConn, IComponent comp, String remotePath) throws TeamRepositoryException { String[] path = remotePath.split("(/|\\\\)"); IConfiguration config = wsConn.configuration(comp); IVersionableHandle itemAtPath = config.resolvePath(comp.getRootFolder(), path, null); if (itemAtPath == null) { throw new RuntimeException("Could not resolve path " + Arrays.asList(path)); } if (itemAtPath instanceof IFileItemHandle) { return (IFileItemHandle) itemAtPath; } System.err.println("We only like files, not " + itemAtPath.getClass().getSimpleName()); throw new RuntimeException(); }
Line 143 performs the path query. The first argument is the root folder, which the the root of the component, and the second argument is the path specified by the user. The third argument is a IProgressMonitor - we don't care about those for this example.
The return value is a handle to an IFileItem, which carries the item type, the item id, and state id. Our example is limited to dealing with files, so we use an instanceof check on line 149 to ensure that it's a file. Repository workspaces can also hold folders (represented by IFolder) and symbolic links (represented by ISymbolicLink) but those would complicate the example, so we're ignoring them.
Uploading New Content
We upload content with the IFileContentManager. In RTC, content knows a few things about itself, namely the encoding, line delimiter (for text files), and an optional previous version. Since this is an example, we hardcode reasonable values:
// Upload content System.out.println("Uploading content of " + contentSource.getAbsolutePath()); IFileContentManager contentManager = FileSystemCore.getContentManager(repo); IFileContent content = contentManager.storeContent("UTF-8", FileLineDelimiter.LINE_DELIMITER_NONE, new FileInputStreamProvider(contentSource), null, null);
The content is read multiple times during the upload, so we can't pass around an InputStream, since the first close() would render it useless. Instead, the caller passes in a factory that allows the stream to be repeatedly opened.
The multiple reads are due to a couple of implementation decisions:
- Our content transport layer is unadulterated HTTP 1.0. In order to use Connection: Keep-Alive, we need to know the length of the stream before we upload it. We don't use content chunking. I don't know why.
- We can't use the file size to determine the length, because we normalize *nix/DOS line endings on upload. Our only option is to walk the file to determine the length.
But callers don't need to know that. Instead, they just have to subclass AbstractVersionedContentManagerInputStreamProvider and define reasonable methods. The FileInputStreamProvider is probably the minimal possible implementation. You can see it on line 49 of TrivialCommit.java
The upload occurs as a single call and returns an IFileContent object. The content object is a client-side references that is used to uniquely identify file text in the repository.
Creating the After State
There are two arcane steps we must take before creating the 'after' state for our change set: we need to inflate the IFileItemHandle from findRepositoryPath() into a full item, and then get a working copy of that full item.
IFileItem fileItem = (IFileItem) wsConn.configuration(comp).fetchCompleteItem(fileHandle, null); fileItem = (IFileItem) fileItem.getWorkingCopy();
As we said above: items are passed between the RTC server and client as a handle consisting of the item id, the state id, and the item type. Handles can be considered cross-network pointers: they're a lightweight representation that allows programmers to refer to the item without worrying about its properties. In this case, we care about the IFileItem itself, so we get the full representation on line 106 by fetching it with IConfiguration.fetchCompleteItem().
Full items are immutable, so we have to ask the item for a working copy of itself on line 107 before we can change it. Once we have the working copy, we make changes to that.
The handle/full-item/working-copy trichotomy gives us some powerful tools.
- We can pass handles across the network quickly, only fetching the full version of the ones we care about.
- We can batch fetching handles, to minimize the number of network operations.
- Immutable full items allow long-lived portions of RTC to assume that the properties of the item haven't changed.
- Eventing when working copies are saved allow the RTC UI to update appropriately.
Recording the Change
Our changes to the IFileItem are minor: we just update the content and modification date. The other fields keep the previous values.
fileItem.setContent(content); fileItem.setFileTimestamp(new Date());
The working copy of the IFileItem is the 'after' state of the file change we want to make. To get the 'after' state into a change set we create an IConfigurationOp containing the working copy. The configuration op is used to inform the repository that a change set should be updated.
// Save the change into a change set IConfigurationOpFactory opFactory = wsConn.configurationOpFactory(); ISaveOp saveOp = opFactory.save(fileItem);
We have IConfigurationOps because we want a common way of talking about item modifications. Aside from the Milquetoast SaveOp, we have ops that merge conflicts, delete items, or remove them from change sets.
We're almost done. We just need to find a change set to record the after state.
Finding the Change Set
In a truly trivial example, we would create a new change set and commit into that. But there's a restriction on commit: an item can only appear in one active change set per workspace. If we try committing it to another change set, the RTC repository will throw an exception. This use case is fairly common, so we'll handle it in selectChangeSetModifying().
private IChangeSetHandle selectChangeSetModifying(IWorkspaceConnection wsConn, IComponent comp, IFileItemHandle fileHandle) throws TeamRepositoryException { List<IChangeSetHandle> activeChangeSets = wsConn.activeChangeSets(comp); @SuppressWarnings("unchecked") List<IChangeSet> changes = wsConn.teamRepository().itemManager().fetchCompleteItems(activeChangeSets, IItemManager.DEFAULT, null); for (IChangeSet cs : changes) { for (IChange change : (List<IChange>)cs.changes()) { if (fileHandle.sameItemId(change.item())) { return cs; } } } return wsConn.createChangeSet(comp, null); }
To avoid the exception, we walk the set of active change sets and look for one with a change to our IFileItem. The IWorkspaceConnection knows the list of active change sets, but only records them as handles, so we convert the IChangeSetHandles into full items with the IItemManager on line 240.
The IChangeSet expresses changes as IChange objects. Each of those modifies a single item, so we walk those to see if our IFileItem is already being modified.. We know that only one change set may modify an item at a time, so we're safe to return when we find the first match on line 245.
There's always the possibility that there aren't any active change sets modifying our IFileItem, so line 250 creates a new IChangeSet if necessary.
Committing the Change
We have all of the parts we need: an ISaveOp describing the after state of our item, a change set to record the change, and a workspace containing the change set. Our commit is almost anticlimactic:
// Save the change set System.out.println("Committing"); wsConn.commit(cs, ops, null);
After the commit is over, we change the comment on the change set and complete it. We do that to make our change set easier to identify. In production code we would (probably) leave the change set open and we certainly wouldn't create such a pointless comment, since the completion time of the change set already has that information.
Running the Program
The program takes a whopping seven arguments: the first three are the repository URI, user name and password. The next three are the repository workspace name, component name, and path of the item to save to. The last argument names the file that contains the bytes we want to commit.
Let's put together a simple example:
Let's put together a simple example:
- Start your repository and connect to it with the RTC Eclipse client.
- Create a trivial repository workspace that has a few directories then open it in the Repository Files view. Mine looks like:
The file text.txt is the target of our commit. - We'll use the eclipse 'Trivial Commit' launch. You need to modify the paths and arguments before you can use it. You can do that by opening the Run menu and executing the Run Configurations gesture. Edit the 'Trivial Commit' launch and modify the arguments as appropriate:
The arguments are: repository URI, username, password, workspace name, component name, path of the item to commit in the repository workspace, and the path of the content to write to the remote workspace. - My initial content for text.txt is an empty file, while the content of /tmp/sample.txt is 'hello commit world'. To verify your content, open the target file from the Repository Files view in Eclipse.
- Run the launch. It should chug for a few moments before performing the commit.
- Refresh the Repository Files view and open text.txt.
- Et voilà!
The file's history contains a change set with our automatically created comment:
Now you have a working commit using the RTC SDK. The sample demonstrates how to find an item in a repository workspace, traverse active change sets to one that modifies a specific item, and add a change to a change set. Along the way you've learned a little more about RTC's item model.
As always, comments are welcome, and the source code is available on JazzHub.
Monday, August 12, 2013
Getting your stuff - using the RTC SDK to zip a repository workspace
Have you ever wanted to create a zip archive of a repository workspace? This post describes how to use the RTC SDK (and some undocumented internals) to copy the contents of a repository workspaces into a zip file.
Let's start with some background. A repository workspace contains components, each of which has a configuration - which is a ten dollar word for "file tree." The configuration provides access to the structure of the tree and has pointers to the file content.
A program that zips up a remote workspace needs to:
- log into the repository,
- find the workspace to zip,
- get the components in the workspace,
- get the configuration of each component, and finally
- walk the file tree to write each directory/file to our zip.
This post uses unsupported API. It is likely that the APIs will change without warning in future iterations of RTC - you should use the Source Control command line tool instead. You are using these APIs at your own risk.
Each step is addressed in its own section. The code samples are available on JazzHub or can be downloaded as a zip. You are expected to have a working development environment with the RTC SDK and RTC server configured properly.Logging in to the repository
All of the information we're interested in is stored on the RTC repository. In order to access it, our programs needs to log in:
ITeamRepository repo = TeamPlatform.getTeamRepositoryService().getTeamRepository(uri); repo.registerLoginHandler(new MyLoginHandler(username, pw)); repo.login(null);
The
pw are configured beforehand. MyLoginHandler
class included in the sample project. The username
and Finding the workspace
For our example, we find the workspace by searching for one with a specific name using the
The interesting classes here are the
IWorkspaceManager#findWorkspaces()
method.The interesting classes here are the
SCMPlatform
singleton that allows us to get a IWorkspaceManager
, and the IWorkspaceSearchCriteria
. The workspace manager answers simple queries about workspaces, as well as providing access to IWorkspaceConnection
s, that we will learn more about below.IWorkspaceManager mgr = SCMPlatform.getWorkspaceManager(repo); // Find the named workspace IWorkspaceSearchCriteria cri = IWorkspaceSearchCriteria.FACTORY.newInstance(); cri.getFilterByOwnerOptional().add(repo.loggedInContributor()); cri.setExactName(wsName); List<IWorkspaceHandle> findWorkspaces = mgr.findWorkspaces(cri, 2, null); if (findWorkspaces.size() == 0) { System.err.println("Couldn't find any workspaces named \"" + wsName + "\""); return false; } if (findWorkspaces.size() > 1) { System.err.println("Multiple workspaces named \"" + wsName + "\""); return false; }
The
Searching by workspace name is useful for our example, but it isn't the safest thing to do in a production environment, since there could be multiple workspaces with the same name. In production UI code, we would present the user with a choice of workspaces. If the code were headless, we would use the ID of the workspace we care about.
Because we want a modicum of correctness, our example ensures that there is exactly one visible workspace with the given name (lines 68-76).
The
IWorkspaceSearchCriteria
allows us to build a query that matches a number of workspaces. The query fields are implicitly and'ed together to limit the workspaces returned. In an ideal world, we'll find exactly one workspace that matches our criteria.Searching by workspace name is useful for our example, but it isn't the safest thing to do in a production environment, since there could be multiple workspaces with the same name. In production UI code, we would present the user with a choice of workspaces. If the code were headless, we would use the ID of the workspace we care about.
Because we want a modicum of correctness, our example ensures that there is exactly one visible workspace with the given name (lines 68-76).
The
findWorkspaces()
method returns a list of handles to the workspaces matching the criteria. A handle is a lightweight object that identifies an item in the repository. We'll use the handle later on to query the workspaces. Getting the components in the workspace
Once we've found the
IWorkspaceHandle
, we need a richer representation to query the file tree. We do that by converting the handle into an IWorkspaceConnection
(see line 78, below). The IWorkspaceConnection
provides operations on a repository workspace, and caches information about the workspace. Now we have the connection, we start digging into the structure of the workspace. The topmost layer in the logical tree consists of components. Components split remote workspaces into logical groupings of files and folders. They aren't normally represented in the local filesystem when loaded, so our zip creator won't record them in the zip.
IWorkspaceConnection wsConn = mgr.getWorkspaceConnection(findWorkspaces.get(0), null); // Start walking the workspace contents IFileContentManager contentManager = FileSystemCore.getContentManager(repo); File base = new File(System.getProperty("user.dir")); FileOutputStream out = new FileOutputStream(new File(base, wsName + ".zip")); try { ZipOutputStream zos = new ZipOutputStream(out); for (IComponentHandle compHandle : (List<IComponentHandle>)wsConn.getComponents()) { IConfiguration compConfig = wsConn.configuration(compHandle); // Fetch the items at the root of each component. We do this to initialize our // queue of stuff to download. Map<String, IVersionableHandle> handles = compConfig.childEntriesForRoot(null); List<IVersionable> items = compConfig.fetchCompleteItems(new ArrayList<IVersionableHandle>(handles.values()), null); loadDirectory(contentManager, compConfig, zos, "", items); } zos.close(); } finally { out.close(); }
On line 89 we loop over each of the components, getting an
IConfiguration
. The configuration encapsulates the file/folder structure in the repository workspace, so we use that to walk the remote filesystem. The first part of the walk is on line 94 where we get the handles of the component's root items. (Note that we're dealing with root items: there could be files and symlinks at the top of the component hierarchy, as well as directories)Walking the file tree to fetch content
We're finally here! The fun part that involves getting file content from the repository. Unfortunately, this is also where we diverge from the supported API. In our last code snippet, you'll notice that we got an
IFileContentManager
on line 81. Sadly, that isn't part of the API anyone outside of the SCM Core is supposed to use. If you do use it, be aware that the class could change in future releases. You use it at your own risk.With the legalese/honesty out of the way, let's look at how we use the forbidden API. Our
loadDirectory
method is called recursively to write the content of each directory into the zip file. It takes a list of IVersionable
items as an argument. An IVersionable
is the superclass of the things that live in a filesystem: files, folders, or symlinks. It is possible that other types of items could exist in the configuration - but let's pretend they don't, because, for the most part, they won't. loadDirectory()
loops over each versionable and either creates a directory in the zip or writes the file content into the zip. In the case of folders, it gets the children from the configuration (line 135), and then recursively calls itself:if (v instanceof IFolder) { // Write the directory String dirPath = path + v.getName() + "/"; zos.putNextEntry(new ZipEntry(dirPath)); @SuppressWarnings("unchecked") Map<String, IVersionableHandle> children = compConfig.childEntries((IFolderHandle)v, null); @SuppressWarnings("unchecked") List<IVersionable> completeChildren = compConfig.fetchCompleteItems(new ArrayList<IVersionableHandle>(children.values()), null); loadDirectory(contentManager, compConfig, zos, dirPath, completeChildren); }
More interesting things happen in the
IFileItem
block:else if (v instanceof IFileItem) { // Get the file contents and write them into the directory IFileItem file = (IFileItem) v; zos.putNextEntry(new ZipEntry(path + v.getName())); InputStream in = contentManager.retrieveContentStream(file, file.getContent(), null); byte[] arr = new byte[1024]; int w; while (-1 != (w = in.read(arr))) { zos.write(arr, 0, w); } zos.closeEntry(); }
The fun part is on line 146 where we ask the (forbidden)
IFileContentManager
for the content of the file. We pass in the IFileItem
as well as its IContent
, which is a pointer to the blob of bytes stored in the RTC repository. The remainder of the block is anticlimactic: copying the content with a regular Java stream idiom. Even though the file content portion of this example is forbidden API, the example helps to show how to use our APIs. The pattern of logging in, finding a workspace, and then using the
You can download the full Eclipse project or poke at the project on JazzHub.
IWorkspaceConnection
to perform some operation may be useful in other contexts. The example doesn't begin to get into the practical complexities of getting content (normalizing line endings, storing file properties, handling symlinks), or the problems faced when merging into an existing filesystem. You can download the full Eclipse project or poke at the project on JazzHub.
Thursday, July 4, 2013
Configuring Eclipse to use the RTC SDK
Last night I was poking around trying to figure out how to write a demo with the Rational Team Concert SDK. My first attempt failed. It wasn't until I found Ralph Schoon's excellent blog post on using the SDK that I finally figured out how to do it.
Since Ralph's post is long and it refers to an even longer PDF, I thought I'd present an abridged explanation:
To verify that your Eclipse is properly configured, download the attached project, and copy it into Eclipse. Get your server configured and started, then edit Start.java to use the URI of your server and credentials of the user you created.
You can run the test application with the "api demo" Eclipse launcher. It logs into the server, creates a repository workspace named "meow", and then lists all of the repository workspaces owned by the current user. At the very least, you should see "meow" in the Eclipse Console:
Since Ralph's post is long and it refers to an even longer PDF, I thought I'd present an abridged explanation:
- Download the RTC SDK and server. At the time of writing, 4.0.3 is the most recent release, so you might as well grab that.
- Extract the SDK to ~/rtc-sdk.
- Start Eclipse on a fresh workspace.
- Set your target platform by:
To verify that your Eclipse is properly configured, download the attached project, and copy it into Eclipse. Get your server configured and started, then edit Start.java to use the URI of your server and credentials of the user you created.
Expected output in a properly configured Eclipse |
Sunday, January 27, 2013
When should you start using a source control?
My eyes were immediately drawn to this thread on Ars Technica: "When should I make the first commit to source control?", with answers from Stack Exchange users.
I'm from a team at IBM that is building a source control. So getting my opinion is a bit like asking your stock broker what he or she thinks about the merits of investing on the stock market. Of course I'm convinced the source control should be a transparent part of your development - you should not even have to think about it while you design and edit your code. It should just be there when you're in a bad state and you want to return to a know good one. Aka, you should not even ask yourself when to make the first commit...
A source control doesn't have to be in the way of your dev work. It knows when you save files, and in many IDEs and products out there, it even knows what task or defect you are working on. It can work in the background, safely pushing your changes from your local drive to a remote machine, so you can crash your hard drive or pursue your work from a separate machine in the evening.
A source control is now a basic feature like syntax highlighting, code assist or refactoring. It's a given that whatever you've done, you can review and roll back in time, fork and try something else. Suspend your current work, resume some other on-going work. Work with a buddie, with a team. And when you can do all that without thinking about having to use a source control, then we've succeeded.
The first tip I give about using a source control is to check-in frequently. By that I mean storing your changes frequently in the source control, which isn't the same as giving every one of your changes to your team. Many source controls have a staged approach - you can version control your own changes in a private way then control when you find them useful and good enough to be shared with others.
In the 8 years of RTC Source Control, we tested different source control workflows. In the early days, we were really keen on something called auto check-in. In 1.0, that feature was on by default. You save a file. Bing. That change is safely backed up on the RTC server, in your private workspace. Some of us were wondering - why bother asking the user when to manually check-in? Why not doing it automatically for every file that is modified? It turned out to be a very divisive matter.
- Some really thought that was the way of the future - just have every change you do automatically be replicated in your backup on the server.
- And others really wanted to stay in control as to when their changes leave their local drive and become part of the source control's memory.
So why did we turn off auto check-in by default? Because many users were hit by some of its drawbacks.
- Network latency when you work over a poor wifi connection at the airport
- Big mess when a mistake you do in your IDE refactors 1000 files.
- Your history is filled with meaningless changes (if you use auto-complete of change sets) or with huge change sets if you forget to help the tool and complete your change sets from time to time
If the source control you use makes a commit sound like a complicated, slow and cumbersome task to perform, you're likely missing the greatest strength of a source control. It's invisible to you when things work, and it's there when you need it. So, in conclusion, next time you create a project, put it under version control right away... Version control is good for you even if you don't intend to share with other peers right away.
Friday, December 21, 2012
Latest videos and articles about RTC SCM
For some of us working in RTC SCM, it's a big snow day, we're not just dreaming about a white Xmas :-) For our developers in locations where snow is a rarity, you cannot imaging the joy of clearing up your drive way... This said, time to reflect on what we've done and published for our RTC users.
Since the articles and videos we listed last July and August, much more has happened in the last five months.
For CLI users, check out these three videos from Shashik and Sridevi.
If your source code base is large - or should I say, huge - and you have to deal with many variants, you want to carefully think about how to organize it in your SCM. Here are tips illustrated with the popular Android OS code base, from John.
How you use your source with your local tools and how you version it in RTC can be straightforward or very sophisticated. These two articles go to great depth in load workflows.
Yes, process is built-in with every component of RTC - Work Item, planning, build and of course source control. If you're a scrum master, component lead or project manager, this article from Evan is a must read.
And if you want to upgrade to the latest version of your VS IDE, we got it covered... Vandana gives an overview there.
For tips on how we review changes when fixing defects and how we set process conditions to ensure appropriate reviews are in place, have a peek at this blog post from myself, and its two videos.
See you in 2013! We've got more in the pipeline...
Subscribe to:
Posts (Atom)