Eskil

Check-in [157bd4fbf9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Documented Mercurial support.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 157bd4fbf90088924844635fdadfb9fdd8b0daf5
User & Date: peter 2008-02-07 20:15:41.000
Context
2008-02-07
20:15
Mercurial support. check-in: a304020e4c user: peter tags: trunk
20:15
Documented Mercurial support. check-in: 157bd4fbf9 user: peter tags: trunk
20:09
Added Mercurial (HG) support. check-in: 7935c006be user: peter tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to doc/revision.txt. 
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

Eskil can compare versions in revision control systems.
Currently RCS, CVS, Git, Subversion and ClearCase are supported.

If you specify only one file on the command line to Eskil, it will automatically detect if the file is under revision control and enter revision control mode.

By default the local file is compared against the latest checked in version.  This is for the common case when you just want to know what you have changed before checking in.

You can use the -r option to select which version to compare.  It works like it does in "cvs diff".  Examples:

<pre>eskil file.txt</pre>
  Compare file.txt with the latest checked in version.
<pre>eskil -r rev file.txt</pre>
  Compare file.txt with the specified version.
<pre>eskil -r rev1 -r rev2 file.txt</pre>
  Compare the two revisions. This does not involve the local copy of file.txt.

The -r options are also available in the GUI in the "Rev 1" and "Rev 2" fields.

<ul>Commit support</ul>

When comparing a file with the latest checked in version, some of the systems
have support for committing directly from Eskil.  If supported, the Commit

button will be enabled.


<ul>RCS/CVS</ul>

For RCS and CVS the arguments to -r are standard version numbers just like to their -r options.  RCS style -r\u003crev\u003e is allowed.
If a revision is an integer, it is added to the last number in the current version, thus giving relative versions.  E.g. -1 gives the second to last version.

<ul>Subversion</ul>

For Subversion the arguments to -r are standard version numbers just like its
-r option.  If a revision is a negative integer, it is added to the current
version, thus giving relative versions.  E.g. -1 gives the second to last
version.

<ul>Git</ul>

Git currently only supports "HEAD" and "master" as -r options.





<ul>ClearCase</ul>

ClearCase has more complex version "numbers".
ClearCase stream names are built like file paths and in -r you can access the streams similar to how you find files.
Your current stream is the "current directory".
A negative version number is offset from latest.
<pre>-r 5                    </pre>: Version 5 in current stream.


|


















|
|
>
|
>








|
<
<
<





>
>
>
>








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

Eskil can compare versions in revision control systems.
Currently RCS, CVS, Git, Mercurial, Subversion and ClearCase are supported.

If you specify only one file on the command line to Eskil, it will automatically detect if the file is under revision control and enter revision control mode.

By default the local file is compared against the latest checked in version.  This is for the common case when you just want to know what you have changed before checking in.

You can use the -r option to select which version to compare.  It works like it does in "cvs diff".  Examples:

<pre>eskil file.txt</pre>
  Compare file.txt with the latest checked in version.
<pre>eskil -r rev file.txt</pre>
  Compare file.txt with the specified version.
<pre>eskil -r rev1 -r rev2 file.txt</pre>
  Compare the two revisions. This does not involve the local copy of file.txt.

The -r options are also available in the GUI in the "Rev 1" and "Rev 2" fields.

<ul>Commit support</ul>

When comparing a file with the latest checked in version, some of the systems have support for committing directly from Eskil.  If supported, the Commit button will be enabled.

<ul>Priority between systems</ul>

If multiple systems are used within a directory Git/Hg will be detected before CVS/SVN.  Command line options -cvs and -svn can be used to put preference on one of those systems.

<ul>RCS/CVS</ul>

For RCS and CVS the arguments to -r are standard version numbers just like to their -r options.  RCS style -r\u003crev\u003e is allowed.
If a revision is an integer, it is added to the last number in the current version, thus giving relative versions.  E.g. -1 gives the second to last version.

<ul>Subversion</ul>

For Subversion the arguments to -r are standard version numbers just like its -r option.  If a revision is a negative integer, it is added to the current version, thus giving relative versions.  E.g. -1 gives the second to last version.




<ul>Git</ul>

Git currently only supports "HEAD" and "master" as -r options.

<ul>Mercurial</ul>

For Mercurial -r works as in "hg cat -r".

<ul>ClearCase</ul>

ClearCase has more complex version "numbers".
ClearCase stream names are built like file paths and in -r you can access the streams similar to how you find files.
Your current stream is the "current directory".
A negative version number is offset from latest.
<pre>-r 5                    </pre>: Version 5 in current stream.
︙︙